From cb27c4b08c278ac7e8a882b638dbf30acd1436cf Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Sat, 2 Mar 2013 07:50:50 -0500 Subject: [PATCH] Place the search icon in the primary slot of the entry Instead of using the secondary slot for both clear and search. This Makes it possible to use the search icon for actions regardless of whether text has been entered, makes it possible to use the primary icon to indicate search status, allows us to indicate the purpose of the entry even if text has been already entered. https://bugzilla.gnome.org/show_bug.cgi?id=694990 --- gtk/gtksearchentry.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gtk/gtksearchentry.c b/gtk/gtksearchentry.c index b729993b3c..b28406a5b4 100644 --- a/gtk/gtksearchentry.c +++ b/gtk/gtksearchentry.c @@ -74,7 +74,7 @@ search_entry_changed_cb (GtkEntry *entry, if (str == NULL || *str == '\0') { - icon_name = "edit-find-symbolic"; + icon_name = NULL; active = FALSE; } else @@ -101,6 +101,12 @@ gtk_search_entry_init (GtkSearchEntry *entry) g_signal_connect (entry, "icon-release", G_CALLBACK (search_entry_clear_cb), NULL); + g_object_set (entry, + "primary-icon-name", "edit-find-symbolic", + "primary-icon-activatable", FALSE, + "primary-icon-sensitive", FALSE, + NULL); + search_entry_changed_cb (GTK_ENTRY (entry), NULL); } -- 2.30.2